Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release-24.2: colexec: add session variable to disable eager cancellation #134905

Merged
merged 1 commit into from
Nov 13, 2024
Merged

release-24.2: colexec: add session variable to disable eager cancellation #134905

merged 1 commit into from
Nov 13, 2024

Conversation

yuzefovich
Copy link
Member

Backport 1/1 commits from #134560.

/cc @cockroachdb/release

This commit adds a session variable that allows us to disable the eager cancellation that is performed by the parallel unordered synchronizer in local flows in some cases when it transitions into draining state. This will serve as an escape hatch in case we find more issues with this feature.

Informs: #127043.
Informs: #127942.
Epic: None

Release note: None

Release justification: session variable to go around a tricky bug.

@yuzefovich
colexec: add session variable to disable eager cancellation
2982e43 
This commit adds a session variable that allows us to disable the eager
cancellation that is performed by the parallel unordered synchronizer in
local flows in some cases when it transitions into draining state. This
will serve as an escape hatch in case we find more issues with this
feature.

Release note: None
@yuzefovich yuzefovich requested a review from a team as a code owner November 11, 2024 23:30
@blathers-crl blathers[crl]
Copy link

blathers-crl bot commented Nov 11, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues     or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Nov 11, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich
Copy link
Member Author

Note that the backport wasn't clean, but the changes are even more targeted than on master.

michae2
michae2 approved these changes Nov 12, 2024
View reviewed changes
Copy link
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 8 of 8 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @mgartner)

@yuzefovich yuzefovich merged commit 6f22d2f into cockroachdb:release-24.2 Nov 13, 2024
19 of 20 checks passed
@yuzefovich yuzefovich deleted the backport24.2-134560 branch November 13, 2024 17:48
@yuzefovich
Copy link
Member Author

blathers backport 24.1 23.2

@blathers-crl blathers[crl]
Copy link

blathers-crl bot commented Nov 13, 2024

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.

error creating merge commit from 2982e43 to blathers/backport-release-24.1-134905: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 24.1 failed. See errors above.

error creating merge commit from 2982e43 to blathers/backport-release-23.2-134905: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.2 failed. See errors above.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michae2 michae2 michae2 approved these changes

@mgartner mgartner Awaiting requested review from mgartner

Assignees
No one assigned
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yuzefovich @cockroach-teamcity @michae2